From 013cd9bbda94be803842b16857a1176c648fe71a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 10 Mar 2009 18:58:23 +0000 Subject: [PATCH] =?utf8?q?=20=20=20=20=20=20=20=20Bug=20574561=20=E2=80=93?= =?utf8?q?=20gtk=5Fstyle=5Fget=20"shadows"=20g=5Fobject=5Fget?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * gtk/gtk.symbols: * gtk/gtkstyle.[hc]: Rename gtk_style_get_property to gtk_style_get_style_property to avoid problems for language bindings. Pointed out by Torsten Schoenfeld. svn path=/trunk/; revision=22502 --- ChangeLog | 9 +++++++++ docs/reference/ChangeLog | 5 +++++ docs/reference/gtk/gtk-sections.txt | 2 +- gtk/gtk.symbols | 2 +- gtk/gtkstyle.c | 10 +++++----- gtk/gtkstyle.h | 24 ++++++++++++------------ 6 files changed, 33 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index d02a32084f..aff84f7489 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-03-10 Matthias Clasen + + Bug 574561 – gtk_style_get "shadows" g_object_get + + * gtk/gtk.symbols: + * gtk/gtkstyle.[hc]: Rename gtk_style_get_property to + gtk_style_get_style_property to avoid problems for language + bindings. Pointed out by Torsten Schoenfeld. + 2009-03-10 Matthias Clasen Bug 574622 – GtkEntry: Should we wrap icon-press and icon-release diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 7ca9118117..ad99ab078b 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2009-03-02 Matthias Clasen + + * gtk/gtk-sections.txt: Rename gtk_style_get_property to + gtk_style_get_style_property + 2009-03-02 Matthias Clasen * === Released 2.15.5 === diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 1e4ec4ee8f..72051c28fc 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -5779,7 +5779,7 @@ gtk_style_lookup_icon_set gtk_style_render_icon gtk_style_get_font gtk_style_set_font -gtk_style_get_property +gtk_style_get_style_property gtk_style_get_valist gtk_style_get gtk_draw_hline diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index b2bb94cd56..9e99266f7c 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -1279,7 +1279,7 @@ gtk_style_new gtk_style_render_icon gtk_style_set_background gtk_draw_insertion_cursor -gtk_style_get_property +gtk_style_get_style_property gtk_style_get_valist gtk_style_get #endif diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 7a8bc0dd7b..769fe79143 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -1741,7 +1741,7 @@ style_property_values_cmp (gconstpointer bsearch_node1, } /** - * gtk_style_get_property: + * gtk_style_get_style_property: * @style: a #GtkStyle * @widget_type: the #GType of a descendant of #GtkWidget * @property_name: the name of the style property to get @@ -1754,10 +1754,10 @@ style_property_values_cmp (gconstpointer bsearch_node1, * Since: 2.16 */ void -gtk_style_get_property (GtkStyle *style, - GType widget_type, - const gchar *property_name, - GValue *value) +gtk_style_get_style_property (GtkStyle *style, + GType widget_type, + const gchar *property_name, + GValue *value) { GtkWidgetClass *klass; GParamSpec *pspec; diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 2b7d66734c..a6af1779c1 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -863,18 +863,18 @@ GtkBorder *gtk_border_new (void) G_GNUC_MALLOC; GtkBorder *gtk_border_copy (const GtkBorder *border_); void gtk_border_free (GtkBorder *border_); -void gtk_style_get_property (GtkStyle *style, - GType widget_type, - const gchar *property_name, - GValue *value); -void gtk_style_get_valist (GtkStyle *style, - GType widget_type, - const gchar *first_property_name, - va_list var_args); -void gtk_style_get (GtkStyle *style, - GType widget_type, - const gchar *first_property_name, - ...) G_GNUC_NULL_TERMINATED; +void gtk_style_get_style_property (GtkStyle *style, + GType widget_type, + const gchar *property_name, + GValue *value); +void gtk_style_get_valist (GtkStyle *style, + GType widget_type, + const gchar *first_property_name, + va_list var_args); +void gtk_style_get (GtkStyle *style, + GType widget_type, + const gchar *first_property_name, + ...) G_GNUC_NULL_TERMINATED; /* --- private API --- */ const GValue* _gtk_style_peek_property_value (GtkStyle *style, -- 2.30.2